From: Owen W. Taylor <otaylor@fishsoup.net>
Date: Tue, 23 Sep 2014 19:33:13 +0000 (-0400)
Subject: Fix help output for nested subcommands
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~1109
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9d72ff2d8e72deef9cf9322e76a0d192c653f2d4;p=ostree.git

Fix help output for nested subcommands

Only 'ostree admin' was appearing in the help message for commands
nested within ostree admin.

https://bugzilla.gnome.org/show_bug.cgi?id=737194
---

diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c
index 9e571200..c87ffa4e 100644
--- a/src/ostree/ot-admin-builtin-instutil.c
+++ b/src/ostree/ot-admin-builtin-instutil.c
@@ -151,6 +151,8 @@ ot_admin_builtin_instutil (int argc, char **argv, OstreeSysroot *sysroot, GCance
       goto out;
     }
 
+  g_set_prgname (g_strdup_printf ("ostree admin instutil %s", subcommand_name));
+
   if (!subcommand->fn (argc, argv, sysroot, cancellable, error))
     goto out;
  
diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c
index 533f15f9..ef54797e 100644
--- a/src/ostree/ot-builtin-admin.c
+++ b/src/ostree/ot-builtin-admin.c
@@ -179,6 +179,8 @@ ostree_builtin_admin (int argc, char **argv, OstreeRepo *repo, GCancellable *can
       goto out;
     }
 
+  g_set_prgname (g_strdup_printf ("ostree admin %s", subcommand_name));
+
   sysroot_path = g_file_new_for_path (opt_sysroot);
   sysroot = ostree_sysroot_new (sysroot_path);
   if (!subcommand->fn (argc, argv, sysroot, cancellable, error))